Merge tag 'upstream/2016.6' into debian/master
authorSimon McVittie <smcv@debian.org>
Sun, 26 Jun 2016 11:12:28 +0000 (12:12 +0100)
committerSimon McVittie <smcv@debian.org>
Sun, 26 Jun 2016 11:12:28 +0000 (12:12 +0100)
Upstream version 2016.6


Trivial merge